merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 13 Dec 2011 23:35:52 +0000 (08:35 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 13 Dec 2011 23:35:52 +0000 (08:35 +0900)
commit3343f481d458bdddcf36acb8c8ec0ec6cef0ec16
treee5f9f1990429cb155efd349539121f15948ed0b3
parentfbb77b4075776f887feb39148866ac11d42bfd01
parent8cc8a5683e62b60f957049e9de6020c716e6a60a
merge trunk